Backport fix for Bug#11382 from trunk
authorChong Yidong <cyd@gnu.org>
Sun, 13 May 2012 09:18:02 +0000 (17:18 +0800)
committerChong Yidong <cyd@gnu.org>
Sun, 13 May 2012 09:18:02 +0000 (17:18 +0800)

Trivial merge